From ad6b1fa9936699cfded1f858d7db49683e89bb9f Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 12 May 2005 15:25:01 +0000 Subject: [PATCH] bitkeeper revision 1.1389.1.50 (4283754dTJV8OKiH7gTm6FnKuQ2bVQ) Fix the Xen build. Signed-off-by: Keir Fraser --- xen/common/dom0_ops.c | 10 +++++----- xen/common/domain.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c index add8f51d43..df92bea133 100644 --- a/xen/common/dom0_ops.c +++ b/xen/common/dom0_ops.c @@ -230,15 +230,15 @@ long do_dom0_op(dom0_op_t *u_dom0_op) break; } - if ( (op->u.pincpudomain.exec_domain >= MAX_VIRT_CPUS) || - !d->exec_domain[op->u.pincpudomain.exec_domain] ) + if ( (op->u.pincpudomain.vcpu >= MAX_VIRT_CPUS) || + !d->exec_domain[op->u.pincpudomain.vcpu] ) { ret = -EINVAL; put_domain(d); break; } - ed = d->exec_domain[op->u.pincpudomain.exec_domain]; + ed = d->exec_domain[op->u.pincpudomain.vcpu]; if ( ed == NULL ) { ret = -ESRCH; @@ -382,14 +382,14 @@ long do_dom0_op(dom0_op_t *u_dom0_op) break; } - if ( op->u.getvcpucontext.exec_domain >= MAX_VIRT_CPUS ) + if ( op->u.getvcpucontext.vcpu >= MAX_VIRT_CPUS ) { ret = -EINVAL; put_domain(d); break; } - ed = d->exec_domain[op->u.getvcpucontext.exec_domain]; + ed = d->exec_domain[op->u.getvcpucontext.vcpu]; if ( ed == NULL ) { ret = -ESRCH; diff --git a/xen/common/domain.c b/xen/common/domain.c index 3729489492..db331a5e14 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -221,7 +221,7 @@ int set_info_guest(struct domain *d, dom0_setdomaininfo_t *setdomaininfo) { int rc = 0; struct vcpu_guest_context *c = NULL; - unsigned long vcpu = setdomaininfo->exec_domain; + unsigned long vcpu = setdomaininfo->vcpu; struct exec_domain *ed; if ( (vcpu >= MAX_VIRT_CPUS) || ((ed = d->exec_domain[vcpu]) == NULL) ) -- 2.30.2